Combine test parameters into TestConfig structure
am: 0d4ba3f33a

Change-Id: I273f1de1e8ccd379abb8137476104c1cb8a0f514