Merge "Allow test to specify whether or not to auto-generate test config" am:...
Merge "Allow test to specify whether or not to auto-generate test config" am: 933b6193 am: acc7f753 am: adb37a22
am: 58f5b5ea
Change-Id: I832b1fbb96650bd4f87b728405aea320e03b76db