Merge "Add TEST_MAPPING for Compatibility api" am: f2679e9bb8

Change-Id: I0f9799c433b86a52fdedfab541f9999cef967dbd