Merge "Fix encoder crashes and enc/dec mismatches"
authorYaowu Xu <yaowu@google.com>
Wed, 13 Jan 2016 21:07:53 +0000 (21:07 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 13 Jan 2016 21:07:53 +0000 (21:07 +0000)

Trivial merge