De-funk adb

Change-Id: I04da983f90b082a1b69504ff62fd8caa9dc62f47