tree 21d86b328b59eae1bef3e2a27a2fd1470b1c45e8
parent 072a7e67d0dfa80299c8cfd2e7b2cff580423aae
parent 47b44e3bb99b480d05bcf0ee863404699e0562fe
author android-build-team Robot <android-build-team-robot@google.com> 1543351432 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1543351432 +0000

Merge cherrypicks of [5624891] into qt-release

Change-Id: Ibde2a19da63c5612dbd379d23d3f57e47a5eaf54