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