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

Change-Id: I8a79ef17e43814658f15b1ee50940eb5c7d05bfe