Merge changes Icb29d2da,Ida906e21 am: fc868645e2 am: 1cf9161f6f am: 12b6e41013
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 20:56:54 +0000 (20:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:56:54 +0000 (20:56 +0000)
am: f6587ed1bc

Change-Id: I486aa995b48ccfdac70dcf61311b2946ecaca9eb


Trivial merge