OSDN Git Service

Merge cherrypicks of [5313290, 5313323, 5313343, 5313415, 5313291, 5313441, 5313557...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 19 Oct 2018 16:33:39 +0000 (16:33 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 19 Oct 2018 16:33:39 +0000 (16:33 +0000)
Change-Id: I3eee7260340d3931be48acb455d8a96179a56b99


Trivial merge