Combine test parameters into TestConfig structure am: 0d4ba3f33a
am: d866d3c3ec

Change-Id: Ib3f96e8e14af45730abe4630ceaa7bba9dfd922f