am 155f7ac7: Merge "Ignore whitespace/indent issues from cpplint."

* commit '155f7ac796f2178886003dbf4e064acdb3089d1e':
  Ignore whitespace/indent issues from cpplint.