tree 535d89d83471254eb398d443d72d4c46a185c423
parent 3d5e93c0b2f8e15703ca692cf57b630faa73309c
parent 4a02061a8f7386c48b377fd88e65fd7367ddf8ee
author android-build-team Robot <android-build-team-robot@google.com> 1602727043 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1602727043 +0000

Merge cherrypicks of [12842985] into rvc-qpr1-release

Change-Id: I108a0ff93118e8545cbab37e2a8dd13ed460ca82