Merge remote-tracking branch 'origin/longtailedduck'
authorJohann <johannkoenig@google.com>
Thu, 12 Jan 2017 23:40:14 +0000 (15:40 -0800)
committerJohann <johannkoenig@google.com>
Thu, 12 Jan 2017 23:40:14 +0000 (15:40 -0800)

Trivial merge