OSDN Git Service

Merge cherrypicks of [4897833, 4897834, 4897835] into oc-m8-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 30 Aug 2018 04:26:34 +0000 (04:26 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 30 Aug 2018 04:26:34 +0000 (04:26 +0000)
Change-Id: I641b54fb04008ba92c1fc4473ddfccabe947ab7e


Trivial merge