Merge "Use data size directly instead of recomputing."
authorJohann Koenig <johannkoenig@google.com>
Wed, 15 Jun 2016 18:23:33 +0000 (18:23 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 15 Jun 2016 18:23:34 +0000 (18:23 +0000)

Trivial merge