Merge changes Id437e220,I9d6b3fba am: 94b6d11640 am: 8a7aa6197d
authorKenneth Graunke <kenneth.w.graunke@intel.com>
Mon, 11 Sep 2017 19:45:03 +0000 (19:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Sep 2017 19:45:03 +0000 (19:45 +0000)
am: ffb306c748

Change-Id: Ifb89181d89ede9381a23e3a3a4a4ce8763ad1a0c


Trivial merge