tree f5ac8519d181e7eddb537561471c603088d56f42
parent 77ad9db6f31e642e3f2dab3a1a07db5ddee87ec1
parent 1b942698c2e6034e06c53d09beaa3fa5d32fe465
author android-build-team Robot <android-build-team-robot@google.com> 1554936551 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1554936551 +0000

Merge cherrypicks of [7003810, 7004390, 7003811] into qt-release

Change-Id: Ie97446b64f694f9abb2092ab8c98f6f41b38b9a4