[automerger skipped] Copy VTS tests from v1.2 to v1.3 am: 4d00307c5c
am: 65e54f3904 -s ours
am skip reason: change_id I09797f5f3898501a008186a22dd411b00e9e2c67 with SHA1 b098d21e0c is in history

Change-Id: I1121c5ecc4cb7e27cdbfd0b7f5836c74692242d6