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

Change-Id: I15233b20a5599add0404ec7e92e0a8f44ae6b1e1


Trivial merge