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:42:20 +0000 (18:42 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 25 May 2018 18:42:20 +0000 (18:42 +0000)
Change-Id: I81960fc50b6324e0a6d23936980b80a5de1a1676


Trivial merge