tree 889688294d891d57915efcb6b33fcd7bff060eef
parent 125e23a2a2b3aa2a017e97c5cb54357a0ccdcf0b
parent b8d7ac60bdeca738346b61a1b84be34f0072af2f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1642728544 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1642728544 +0000

Merge cherrypicks of [16441898, 16441899] into sc-v2-release.

Change-Id: I9fbbca76745f9d0cb20b142d1e1c00cf1f6d25c1