Merge "Fixing app compat issue b/72143978"