Merge "adb: disable failing test." am: c4876f1905
am: 089faef2a2

Change-Id: I7ec2aabdf332ed17ffc3ce560d2ab88bb4527831