Merge "Remove a special case"
authorYaowu Xu <yaowu@google.com>
Thu, 20 Dec 2018 16:54:08 +0000 (16:54 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 20 Dec 2018 16:54:08 +0000 (16:54 +0000)

Trivial merge