OSDN Git Service

Merge cherrypicks of [2889978, 2889517, 2889500] into oc-m2-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 13 Sep 2017 17:27:07 +0000 (17:27 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 13 Sep 2017 17:27:07 +0000 (17:27 +0000)
Change-Id: Ie3fdbc69495269cbfdfafe662d6172c3b0f5c168


Trivial merge