Merge "Adding new feature to adb "abb"." am: d7a501d184 am: e49c97f479
am: 2381d673ca

Change-Id: Ibfdda06e455228da200f2e15446bd0468b8623db