Merge "Add auto_gen_config and TEST_MAPPING." am: 9d7cf926ef am: a665ab8f12

Change-Id: I9b71cfd4d9bd0502cb6f2505c60bec7a5057ebdf