[automerger skipped] Fix VTS ValidationTest for 1.2 ops. am: a6b1dc7d9b am: 6eeba37fad
am: 9706fbc862  -s ours

Change-Id: Ib49c598ee06a86d64da693d5bdeded3a430a8c40