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

Change-Id: I69a60ce5efd0bfa59e8d9bad1a7de6c1bcee23c9