OSDN Git Service

Merge cherrypicks of [4195294, 4195296, 4195440, 4195441, 4186165, 4186166, 4186580...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 25 May 2018 18:43:08 +0000 (18:43 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 25 May 2018 18:43:08 +0000 (18:43 +0000)
Change-Id: I8fd2e5330a81cee2c04924c1e775adb07068a021


Trivial merge