Bug: 73011528 Change-Id: Ic00c13175132ebd30a928832c5c0769b2fc25f70 (cherry picked from commit 27f7e616)