tree 2484978dfcc6f157d6f1e3fa68f67951cf6b7e52
parent b64377de1e015f631e9626f71515da1b0971696e
parent 3d07cacb8d00862371afa9736a583b93b4ea2b24
author android-build-team Robot <android-build-team-robot@google.com> 1536683720 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1536683720 +0000

Merge cherrypicks of [4993928] into pi-qpr1-release

Change-Id: I90209b0e7b1abd1d96f1744ecd647913ad9e7d66