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

Change-Id: If2c53cc93bf2a565df873d5b81eb8248562d45f9