[automerger skipped] Combine test parameters into TestConfig structure am: 0d4ba3f33a am: d866d3c3ec
am: 6a2c7fe831 -s ours
am skip reason: change_id I928aaa42e4745b4a8e0e461046e9632b052d0135 with SHA1 66f598e10d is in history

Change-Id: I5fafe78ed04448d6348b8bac9ea3e7ad7cc9df36