tree 5201cbebc1bd581eb27c290dee5c7b0140190c59
parent 96879019090356e59496c342e5367effdb421d67
parent ea4bce75cfebd7cef90b1e483d752b252f09333c
author android-build-team Robot <android-build-team-robot@google.com> 1576709766 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1576709766 +0000

Merge cherrypicks of [9950314, 9950315] into qt-qpr1-release

Change-Id: I3411185536f0057b55127c295d141ea7212f50af