tree bffbf453eceb584b2f18218ac74d8b41339333d8
parent 66802d177fec860c20a496c3af0bebc536163b13
parent d9e778ba4f39ab18390cb2716aed05c17869943a
author android-build-team Robot <android-build-team-robot@google.com> 1549585259 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1549585259 +0000

Merge cherrypicks of [6298554, 6298593, 6297763, 6297764] into qt-release

Change-Id: Iac52907ba38101780e5ff4f926f9c7460564001f