tree 283b9f6e05aba878f390dc7561e651c3109a3894
parent 644edf83de5c8244bb4079ff96576d77e7f1f881
parent 81fb20a343d800a52d381dd18cdc03fabbfa8c79
author android-build-team Robot <android-build-team-robot@google.com> 1536190536 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1536190536 +0000

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

Change-Id: I0b8f2268cf9796147f18e41506e938d5bbef09c3