tree e1a90504185eb46a018c6d6fddcb2dd4b70f767c
parent a384019d9db1baa9ebf37ea64f525ecc709fd2e4
parent 5727439e2f5302a225310f4af3f373e9e8424495
author android-build-team Robot <android-build-team-robot@google.com> 1542306078 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1542306078 +0000

Merge cherrypicks of [5532243, 5532244, 5532245, 5532246, 5532247, 5532826, 5530552, 5532902, 5530553, 5531520, 5532903, 5530554, 5529581, 5529582, 5531521, 5532979, 5532999, 5532248, 5531522, 5531523, 5531524, 5531525, 5531526, 5529583, 5529584, 5529585, 5529586, 5531351, 5529632, 5530506, 5530507, 5532980, 5533000] into pi-qpr1-release

Change-Id: I5d0e30f5d11b01d398b39d7b9e0d375c949370a0