tree b6e0cd86a0af15d39b95349cc56c47c2deaaff41
parent b4c47e7a171696c4718395a19fcbdc3d9fa1bf66
parent e5e440594bd597477f8f9e5f72e962ada287c0fa
author android-build-team Robot <android-build-team-robot@google.com> 1541192429 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1541192429 +0000

Merge cherrypicks of [5426558, 5426683, 5424327] into pi-qpr1-release

Change-Id: I163f6ccaa1f6b67aefa7870acff37fdd0bf51cf5