[automerger] Fix some VTS for 2017 devices am: 44bd0bb4f4  -s ours am: 9ed807a6c9

Change-Id: Ib4e41835067eefdf0325b8f0c0330e8f015d0492