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:40 +0000 (04:26 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 30 Aug 2018 04:26:40 +0000 (04:26 +0000)
Change-Id: I67a29ac6b41042b98bf78c34151436502cc23c43


Trivial merge