OSDN Git Service

Merge cherrypicks of [4315359, 4315389, 4315390, 4315519, 4315520, 4315360, 4317665...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 12 Jun 2018 01:49:25 +0000 (01:49 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 12 Jun 2018 01:49:25 +0000 (01:49 +0000)
Change-Id: I913d48556bf01f9baf0b1e2d6dfc41127a9816d1


Trivial merge