Merge "Fix some VTS for 2017 devices" into oc-dr1-dev am: 92cc6209a7
am: 708f8bec63  -s ours

Change-Id: I85f7cfabb3586ee492253f9b24b095b7558bb50b