Merge "TEST_MAPPING: add the rest of our actively maintained tests." am: f2228e0cc5 am: 93193fc275
am: 6fd017ad3c

Change-Id: I4fbf80b6152a7ac7965c403f001e5a0f7d0ec83c