Add legacy test configuration am: 71b4bf30cf am: b4104c6db4

Change-Id: Id9727da7feb49704e9557711fa03ff9dec68dfd6