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

Change-Id: I9f57a9c10aa6552af28bac896b330c73ad602b36