tree 9c451174d08535dfcedaf93d9560903af90f1c20
parent e6ef013d2c8c1201540128d9961b73450257ab90
parent c61ef453799bb6deb1fb78e19ce7bd3eb453650a
author android-build-team Robot <android-build-team-robot@google.com> 1557525175 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1557525175 +0000

Merge cherrypicks of [7444491, 7444492] into pi-qpr3-release

Change-Id: I25bf6d45138576b2318d295679878cc6cf8f9c2f