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

Change-Id: I265da403e05540802aa8f9502c5c0466cf2e0c1b


Trivial merge