OSDN Git Service

Merge cherrypicks of [16816453] into sc-v2-release.
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>
Tue, 15 Mar 2022 18:17:52 +0000 (18:17 +0000)
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>
Tue, 15 Mar 2022 18:17:52 +0000 (18:17 +0000)
Change-Id: I9a0ba25922932a9b49cf4b8d30b930bb9a122f19


Trivial merge