OSDN Git Service

Merge cherrypicks of [2379117, 2381642, 2381625, 2377657] into oc-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 9 Jun 2017 04:28:39 +0000 (04:28 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 9 Jun 2017 04:28:39 +0000 (04:28 +0000)
Change-Id: I368f0a23d17d32f1e2d72c0ecbc0721513c82e4e


Trivial merge