tree 2a36474f6d80275c5018fedc76d902245a8bbdd3
parent fc89fc0b169eb681c0a33f563d547270f4fc10c2
parent 9b82a4141190e9a227111a5edc84d1cd2bf63af4
author android-build-team Robot <android-build-team-robot@google.com> 1568231696 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1568231696 +0000

Merge cherrypicks of [9372739] into qt-qpr1-release

Change-Id: Ib0a6069fd9daa1ad9137d5c80d052ea05250015b