tree 7a8c6aa8d904570307d0ca6dff6220f0eeb1cea0
parent 37467685ad86d30a31be11b84accc95147ddce25
parent 62d4ab0cb9e8055aa4d9a6e38d6920f595765a08
author android-build-team Robot <android-build-team-robot@google.com> 1574713202 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1574713202 +0000

Merge cherrypicks of [9802108, 9802110, 9801869] into qt-qpr1-c-release

Change-Id: Ia71727857708831fa8a583806c78f16294a061ca