OSDN Git Service

Merge cherrypicks of [2887209, 2884958] into oc-mr1-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 12 Sep 2017 22:44:45 +0000 (22:44 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 12 Sep 2017 22:44:45 +0000 (22:44 +0000)
Change-Id: Iff723ce99739225a554283b0443f45548e7a2c7a


Trivial merge