am 9f0f305b: am 3896033f: am 155f7ac7: Merge "Ignore whitespace/indent issues from cpplint."

* commit '9f0f305b52b0f74e61ecb81d2a5383293048a969':
  Ignore whitespace/indent issues from cpplint.