Merge "Fix two asan failures"
authorYaowu Xu <yaowu@google.com>
Thu, 15 Oct 2015 14:38:05 +0000 (14:38 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 15 Oct 2015 14:38:05 +0000 (14:38 +0000)

Trivial merge