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

Change-Id: I93a18b497f42582ee578467a34494defee766af9