Merge commit 0f508e64c1 into main

Bug: 384137941
Change-Id: I5cada450ede1f0c76b0124d33449e4a49bcd6086