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

Change-Id: I39ce2533de78c0529c8a705f173303e713b51cb6