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

Change-Id: I206cb0709281db0817ff2b70dab0597d66f634ee