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

Change-Id: If6e67a008d02dc561982583a3819de1ef3e06e46