OSDN Git Service

Merge cherrypicks of [2910953, 2911031, 2908688] into oc-mr1-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 15 Sep 2017 21:11:16 +0000 (21:11 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 15 Sep 2017 21:11:16 +0000 (21:11 +0000)
Change-Id: Ie6ce478c42843ec86632b2bd5b3c35cedbbddc53


Trivial merge