tree af9158a661650a87f4e21e241e25db71f844501c
parent 47e17fe7bdf7bba938cab019746b173fcc0f50e2
parent 9c15a04654038dd7c07ad86115b82c5b38441a8a
author android-build-team Robot <android-build-team-robot@google.com> 1543682291 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1543682291 +0000

Merge cherrypicks of [5665869, 5671786, 5671787, 5671788, 5671580] into pi-qpr2-release

Change-Id: I4faab86710c73362b76b487d7ef15ac551db5c7b