tree 993b580c4ba5b33bc305b7f5aad162b47af16daf
parent 829164e04ca48f0d5b7ea352eaf6be35775d6c80
parent 06223bbb5e5fe9cda704c9a0f86ac2560536bc25
author android-build-team Robot <android-build-team-robot@google.com> 1574713275 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1574713275 +0000

Merge cherrypicks of [9802047, 9802131, 9802048, 9802634] into qt-qpr1-release

Change-Id: I634af6864e16d4d1d4efa61a1c09e2109dd93be2