Merge "Remove duplicate definitions"
authorYaowu Xu <yaowu@google.com>
Wed, 20 Jan 2016 18:12:51 +0000 (18:12 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 20 Jan 2016 18:12:51 +0000 (18:12 +0000)

Trivial merge