tree 2a394c58860050707bd538f1520fa50123bd4279
parent 1a0db62d83ebf34ec210c37dd0ed8c7a406e4953
parent c60dd86d0b7a2228a91e02cf22ee30664dd9aa77
author android-build-team Robot <android-build-team-robot@google.com> 1536190535 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1536190535 +0000

Merge cherrypicks of [4948448, 4948511, 4948299, 4947854, 4947306, 4946150, 4948531, 4946116, 4948532] into pi-qpr1-release

Change-Id: I1686f504c66c0448cf30d915a043328d7063e7d7