[automerger skipped] Fix VTS ValidationTest for 1.2 ops. am: 1a2492f311 am: 0702c15cc0
am: 73b52ccf89  -s ours

Change-Id: Ia60c3a5a232756a64ad9f0df3458a37fe7f883bb