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

Change-Id: I7532124bae2d06f1bcce58e86e45f28d3c519b87