This reverts commit 2cddb8a8. Reason for revert: break app compat test b/149923038 Bug: 149923038 Change-Id: Ibace06f704595d40a4439c0bdfea55d11294ba77