Merge \\\\"Minor adb style fixes.\\\\" am: 35151f49ca am: b94f3c597c am: 4d6559af5b
am: f9e0583e8e

Change-Id: I4746e6873450df2f24a7a5d262fdc47d9daa61a4