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

Change-Id: I7579e29cbd211834e079590d4c333047ff75576c