Merge "Add TEST_MAPPING to schedule auto test" am: 5c262a92de am: 374153a5cc

Change-Id: Ibc8da453623946b48b0b0cb8b9ad05295a1ad80c