Merge "Be more civil in comments"
authorTreehugger Robot <treehugger-gerrit@google.com>
Tue, 27 Sep 2016 00:26:12 +0000 (00:26 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 27 Sep 2016 00:26:12 +0000 (00:26 +0000)

Trivial merge