OSDN Git Service

Merge cherrypicks of [3463668, 3464926, 3464927, 3464663, 3464895, 3464928, 3464896...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 16 Jan 2018 21:39:07 +0000 (21:39 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 16 Jan 2018 21:39:07 +0000 (21:39 +0000)
Change-Id: Iba94fca4f61da645d68a4ac14b0f280a170d00d3


Trivial merge