tree 9b29c1de32b4e1081a57fded11a84b07b7aa0b1d
parent 78f00af29541a273fd56dfd2d3a4de7cf13989ef
parent b3a7f4c2817519e8576729b5a7725d96ecaa7e56
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1643410235 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1643410235 +0000

Merge cherrypicks of [16738090, 16738091] into sc-v2-release.

Change-Id: I7625741c80ff4a3bbdf79eac51688126d6683225