Fix some VTS for 2017 devices
am: 44bd0bb4f4  -s ours

Change-Id: I428132b88cc6a3da7769b2dbb7669a11203d7976