tree 49b8cb1e3df317471f34c8a43c5368ea94bc5d4b
parent ab2e9a27fed1550c95c9a8afba547e4848c9d38a
parent 273af68825de1ea2d1e4038088c45f80376e2e43
author android-build-team Robot <android-build-team-robot@google.com> 1536621686 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1536621686 +0000

Merge cherrypicks of [4986743, 4986744, 4987539, 4987168, 4986376, 4986377, 4986378, 4986889, 4986745, 4986746, 4986747, 4986748, 4986749, 4986750, 4986773, 4987169, 4987170, 4987611, 4987631, 4987632, 4987633, 4987634, 4986890, 4987612, 4987651, 4987598, 4987613, 4987614, 4987615, 4987599, 4986379, 4986380, 4987652, 4987653, 4987691, 4986774] into pi-qpr1-release

Change-Id: I181deec3875449ab991738f9e831e6e46834ab1a