Bug: b/372895305 Test: unit test Flag: EXEMPT bug fix Change-Id: Ife615c78c48a2d6f5b938c880c9c2128c5551644