tree d54a8f6abca0694cfbee1f3564eee63160fcf235
parent 3c99bb4e5e6157eb085d12807bdc38d7fd60f888
parent 083263937bfb1623adf6015da7ca3cdc258e0352
author android-build-team Robot <android-build-team-robot@google.com> 1536621669 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1536621669 +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: I8b14c931d6192636f154f39319c51aa8b4d7527b