Merge in fixes from Google repo
authorPyry Haulos <phaulos@google.com>
Thu, 21 Apr 2016 22:09:41 +0000 (15:09 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 21 Apr 2016 22:09:41 +0000 (15:09 -0700)

Trivial merge