tree 5eb7d20ab513556374164e5011734979761274c7
parent 82fa3744fa64635a419308f3d6b3882653d86a36
parent ef819708a858fc14d331ee4638430d0be7e69532
author android-build-team Robot <android-build-team-robot@google.com> 1619471742 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1619471742 +0000

Merge cherrypicks of [14314690, 14314560] into sc-v2-release

Change-Id: I31ec6f37c719faf09ae511b12d8b53564ad83879