Merge remote-tracking branch 'khronos/master' into HEAD
authorChris Forbes <chrisforbes@google.com>
Tue, 25 Sep 2018 19:47:20 +0000 (12:47 -0700)
committerChris Forbes <chrisforbes@google.com>
Tue, 25 Sep 2018 19:47:20 +0000 (12:47 -0700)
Change-Id: Icf5ec8a9a623f7264a973e87a0bb2f901097aa03


Trivial merge