Merge "Add adb integration test to general-tests" am: 7b1d163cb8 am: d8ecfb6db7
am: e6255a00e8

Change-Id: I316e8d5f0d97bbee2053f37af74f3db9677915db