tree 7b0760402be65e8e55168ab2fc7da07d3eac0514
parent 512462f39216b775683900c3ff70e3edb434d728
parent aafc6aabc50b746a756a8ccd23078b62c922ce00
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1657158537 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1657158537 +0000

Merge cherrypicks of [17034414] into sc-d2-release.

Change-Id: I9aad69a902f6cdb534b6201deb59c5b61832de5c