Merge "TEST_MAPPING: add the rest of our actively maintained tests."
am: f2228e0cc5

Change-Id: I05ceb9fdbeb041d8877cef076715744dacef4fa9