Bug: 74392619 Fixes: 72481438 Test: presubmit Change-Id: I1a04fe59216ac94ade8db0c2f56b83ca648db1e7 (cherry picked from commit 835c8b39)