adb: partially revert b5e11415.
am: 59dc0ecaaa  -s ours

Change-Id: Iaaaad72b7b683c30139682a4e96e17d2f73dfe2b