Merge "Fixing app compat issue b/72143978"
am: 7bc4454186

Change-Id: I6f5cc5df58539dd0efd476c4f198ee6c10a8339c