OSDN Git Service

Merge cherrypicks of [3287457, 3287458, 3286978, 3286979, 3287477, 3287478, 3287479...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 29 Nov 2017 18:11:51 +0000 (18:11 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 29 Nov 2017 18:11:51 +0000 (18:11 +0000)
Change-Id: I34c0761000c9003b56371511682f4bed7e99b706


Trivial merge