OSDN Git Service

Merge cherrypicks of [4032295, 4031611] into pi-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 9 May 2018 20:24:46 +0000 (20:24 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 9 May 2018 20:24:46 +0000 (20:24 +0000)
Change-Id: If69c17d4e02b9e63ce26ae9c185efb255199daf6


Trivial merge