tree 1c0cc7d80509499c77b940d94cc7300e278257bb
parent 9180628d3c8bd0392460636bb0dba24cf190cab3
parent d78579c5205f76ab98a49a245c037eb0a667c328
author android-build-team Robot <android-build-team-robot@google.com> 1559165564 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1559165564 +0000

Merge cherrypicks of [7798124] into qt-release

Change-Id: I418dfc38af2887f5884c5fd4fca5bb018d577dcf