Merge "Fix some VTS for 2017 devices" into oc-dev
am: 41b188be76  -s ours

Change-Id: Ibbc305aff92fbd20ea678f3c89d05e468c573cee