OSDN Git Service

Merge cherrypicks of [5317808, 5317809, 5318498, 5317873, 5318338, 5318195, 5318499...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Sat, 20 Oct 2018 00:21:03 +0000 (00:21 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Sat, 20 Oct 2018 00:21:03 +0000 (00:21 +0000)
Change-Id: Ia6434abde93ea6328659f8f08c3d5dbe4e69291d


Trivial merge