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

Change-Id: Ie076eb8e095d687ea238e8dfef3cd1fb3caddbd2