tree 5ed13f83178186fb29afce752b6c6d78a2ab623a
parent c87bbeea6bc6c693af9bf8648cdd6f777c9a46e6
parent b39a166018f1e4495ba5071bcd5cdb9eba951b47
author android-build-team Robot <android-build-team-robot@google.com> 1565833176 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1565833176 +0000

Merge cherrypicks of [9201404] into qt-release

Change-Id: Ie491575f45eb7885eb00854f7e28657d0a783e08