tree 3b4d991941d84a3970310145f81da69522e75681
parent 2de1d073007596429bae65ffe943f081bb161ad5
parent 1abe97c1abac95669fa6e80f4d6ca726cd49d80c
author android-build-team Robot <android-build-team-robot@google.com> 1533238339 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1533238339 +0000

Merge cherrypicks of [4681974, 4681592] into pi-release-2

Change-Id: I4bcb337b9a5e2f8a1ee9be0fa7b625134a4b1a75