am 6f485c62: Fix cpplint whitespace/indent issues

* commit '6f485c62b9cfce3ab71020c646ab9f48d9d29d6d':
  Fix cpplint whitespace/indent issues