Merge "Force test config to be updated when auto_gen_test_config.py is changed"
am: a52691b12a

Change-Id: Ib969a5f9f3cf0ea02843b2265db845b702a8da19