Merge remote-tracking branch 'khronos/master' into HEAD
authorChris Forbes <chrisforbes@google.com>
Fri, 28 Sep 2018 00:00:58 +0000 (17:00 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 28 Sep 2018 00:00:58 +0000 (17:00 -0700)
Change-Id: I5af8cea42c1f8fa18361ff1061e25e99385ca32e


Trivial merge