Bug: 76112369 Test: manual Change-Id: I626c5506be353c611113c8938ed75e47244a09e9 (cherry picked from commit 1787b29e)