Merge "Fixing app compat issue b/72143978"
am: 0f2ed7d398

Change-Id: Iee2097bf9db16f0056da2daa6c319a894078195a