Fixes VTS test failures.
am: 2a0101203f

Change-Id: I99e09cd4ecf54b9e0b495938ebce1c771f3d9325