Merge "Add some const qualifiers where applicable"
authorHui Su <huisu@google.com>
Wed, 30 Jan 2019 18:17:11 +0000 (18:17 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 30 Jan 2019 18:17:11 +0000 (18:17 +0000)

Trivial merge