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

Change-Id: Ie545837d543b931ee4b4fc07239d5e246f108d61