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

Change-Id: I5be2f77e59e3bc098c3323befc19ba9e7b35b121