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

Change-Id: Ic1f9a9b296fdd34837e2927a367b265a82c909a4