tree b1e92ef7d81ec948fc96fbba37cefd4ff83e2ef1
parent e3c9cf9443ea24bb4f6e10c4540888f5460ef284
parent 4ef3a285a0cdb0986c96e657a1be3bb8919104b1
author android-build-team Robot <android-build-team-robot@google.com> 1540587474 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1540587474 +0000

Merge cherrypicks of [5371217, 5371218, 5370861, 5369688, 5370512, 5370513, 5371204, 5371205] into pi-qpr1-release

Change-Id: I2426d117dfad7c184258ea355a041c90063396bc