This reverts commit f2d03d22. Reason for revert: unexpected app-compat impact Change-Id: I59dac6564b9e6c43f5bee82a7a8cd7e6f52f4f1d Fixes: 144190081 Bug: 123756136 Test: none