am 1b154930: Merge change 1867 into donut

Merge commit '1b154930b2c2634dce9c04d5d5cec7acb229ccb0'

* commit '1b154930b2c2634dce9c04d5d5cec7acb229ccb0':
  Cleaning up whitespace in adb sources. Nothing more, nothing less.