Merge remote-tracking branch 'aosp/master' into HEAD
authorChris Forbes <chrisforbes@google.com>
Tue, 13 Nov 2018 00:55:39 +0000 (16:55 -0800)
committerChris Forbes <chrisforbes@google.com>
Tue, 13 Nov 2018 00:55:39 +0000 (16:55 -0800)
Change-Id: I5293daab2672e663e07ee88e522b2d56ccb0e226


Trivial merge