OSDN Git Service

Merge cherrypicks of [3423271, 3423173, 3422907, 3422908, 3423174] into pi-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 5 Jan 2018 20:00:40 +0000 (20:00 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 5 Jan 2018 20:00:40 +0000 (20:00 +0000)
Change-Id: Ie6b8b14b8d80b81a1db4831ea6df891346369b82


Trivial merge