OSDN Git Service

Merge cherrypicks of [3416661, 3417182, 3417738, 3417739, 3417758, 3417360, 3417361...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 4 Jan 2018 19:32:44 +0000 (19:32 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 4 Jan 2018 19:32:44 +0000 (19:32 +0000)
Change-Id: I948f23f8151d2813cd1c1a071242cec6e2004b62


Trivial merge