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

Change-Id: Ide9468359dc4bdfd9e47a3f5f3aaa345d8096cd8


Trivial merge