Merge "Fixing app compat issue b/72143978" am: 7bc4454186 am: 10b6406590
am: c52053e718

Change-Id: I9fe03a711cc63cd83daff561fc6f72280febd050