Merge "Add TEST_MAPPING for api specifications" am: 6bb71b0322
am: cd2586709b

Change-Id: I1a7e4d52a48318b0786a91e33431c3d27a31a8b5