Merge changes Iaf75d17e,I3977c3c2,Iff74939d into oc-mr1-dev am: 5af097b242
authorMika Isojarvi <misojarvi@google.com>
Tue, 5 Sep 2017 17:51:13 +0000 (17:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Sep 2017 17:51:13 +0000 (17:51 +0000)
am: 16d8f177f2

Change-Id: I2ac13d433a45d7658576c80e443418ee5fd9fc6b


Trivial merge