tree bc5b2ae5e4ee0eac33e6b2b4ed042c9fc350e4dc
parent 6549663abd2b966b217f41cb7c9d1540f3eef4a1
parent 9931b2f418289238decd7a61319f55c554990c2b
author android-build-team Robot <android-build-team-robot@google.com> 1571111740 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1571111740 +0000

Merge cherrypicks of [9551688, 9551401] into qt-qpr1-b-release

Change-Id: I8dbd80e24166d45512b42c41ad5e924ca64be8ac