tree d1b03d0ce81859fcad422eb177f0b51842e2f63d
parent 8d245643f91f5bbbc3c132a0d4723c23ffce1c4c
parent d4b846faeca2dfb52e732b1d01fad266610c3699
author android-build-team Robot <android-build-team-robot@google.com> 1570390164 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1570390164 +0000

Merge cherrypicks of [9513175, 9513021, 9513295] into qt-qpr1-release

Change-Id: If052c1a281b65d351c7b5dd49d747165d46cda1f