Merge changes Iee2918c1,I3a98fe12 into oc-mr1-dev
authorMika Isojarvi <misojarvi@google.com>
Wed, 6 Sep 2017 16:40:54 +0000 (16:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Sep 2017 16:40:54 +0000 (16:40 +0000)
am: 77827f4212

Change-Id: I26434955a5eb8f2648ceb3f082374db627d358f4


Trivial merge