[automerger skipped] Copy VTS tests from v1.2 to v1.3 am: 13fdfcd4 am: 057bc6ef -s ours
am: 7592900c -s ours
am skip reason: change_id I09797f5f3898501a008186a22dd411b00e9e2c67 with SHA1 4d00307c is in history
Change-Id: I34b6dccb67c47288401dce2caab5ca726731ef49