Merge branch 'google'
authorPyry Haulos <phaulos@google.com>
Wed, 5 Aug 2015 15:34:30 +0000 (08:34 -0700)
committerPyry Haulos <phaulos@google.com>
Wed, 5 Aug 2015 15:34:30 +0000 (08:34 -0700)

Trivial merge