Merge "Fixing app compat issue b/72143978" am: 8353a39ecc
am: 61bab24fa8

Change-Id: I6f07f1d9cfd26aa8b93a2563349b5e40effb7a41