am 584e1e39: am c40a4350: Merge "Remove whitespace."

* commit '584e1e39e1320f8d368ca913292e04a24853dca2':
  Remove whitespace.