tree 08b21f535c3ab0791a9d6468af56866bebfaef40
parent ea787d8c9014024a008a32f84c906d20dda59981
parent f226bb1f86ec75b098c67cf27f2cb096161a1ee2
author android-build-team Robot <android-build-team-robot@google.com> 1563507679 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1563507679 +0000

Merge cherrypicks of [8689551, 8689566, 8689567, 8690716] into qt-release

Change-Id: If76d9d6d021e63f0d45d1d0d7f444b830a8ca76a