Merge "Add TEST_MAPPING for api specifications"
am: ac2549f7b7

Change-Id: Idca05558f4fe4f8254c7e71c000a9fee2ab326ff