tree db2543d98d6fca673951f158d5027278c8237b4a
parent 852b53ccb3aefbb635b6f179e57e8b3be97b8f6e
parent 2b99c7ab95bb0e81461e8249f4bd148d20987824
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1665604106 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1665604106 +0000

Merge cherrypicks of [20124955, 20131744] into tm-qpr1-release.

Change-Id: I41e61a03e8b7712cb057dbdc4818fed96e496c5c