Merge "Fix some VTS for 2017 devices"