Merge "Fixing app compat issue b/72143978" am: 0f2ed7d398 am: 11ecd63660
am: 3e554073a4

Change-Id: I9afc6636175be9da7fc8d8b2900251a7741eaf66