tree 36dadc43f05e2ad915961e816ad2a4c2207daa81
parent 59a2058610bb56c26120e256c0cf4198af1d901d
parent 195fda73adc2f0e88bd05bfee45888bd3e09da1a
author android-build-team Robot <android-build-team-robot@google.com> 1542306135 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1542306135 +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: I74e00c0aa5ce9cec6792601c2fc0f84c650c1f9d