bug: 74073607 Change-Id: Iea85c88eefdcb2b2774bdddd0a576fdf9770de08 (cherry picked from commit 93c3a408)