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

Change-Id: I7193873ca782bb264bbc8094e44c21ea2d31452f