Merge in fixes from Google repository
authorPyry Haulos <phaulos@google.com>
Fri, 22 Apr 2016 21:31:20 +0000 (14:31 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 22 Apr 2016 21:31:20 +0000 (14:31 -0700)

Trivial merge