Merge "Rationalize type to avoid integer out of range"
authorYaowu Xu <yaowu@google.com>
Fri, 24 Jun 2016 13:58:36 +0000 (13:58 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 24 Jun 2016 13:58:36 +0000 (13:58 +0000)

Trivial merge