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

Change-Id: I35fa5a84b7d0012007a7433e5c0fe2372b080846