Merge "Add auto_gen_config and TEST_MAPPING." am: 9d7cf926ef
am: 7636bbbbe6

Change-Id: I5423f46ea351b819827b3e273e47003f6d0e7211