[automerger skipped] Fixes VTS test failures. am: 2a0101203f am: aac609d9bc
am: 40ad986eab  -s ours

Change-Id: I42a6ea4f4b1d7c30d1fd2b435ef626ef42c06227