Bug: 78288018 Test: manual Change-Id: I44349cd22c141483d01bce0f5a2131b727d0feb0 Merged-In: I44349cd22c141483d01bce0f5a2131b727d0feb0 (cherry picked from commit 1b9a465e)