Merge remote-tracking branch 'origin/northernshoveler' into HEAD
authorJohann <johannkoenig@google.com>
Mon, 4 Feb 2019 19:46:43 +0000 (11:46 -0800)
committerJohann <johannkoenig@google.com>
Mon, 4 Feb 2019 19:46:43 +0000 (11:46 -0800)
BUG=webm:1573

Change-Id: Ie92df3adfac44d7e9c143994ef4f69cd1a04e4b8


Trivial merge