Bug: 78288018 Bug: 111436796 Test: manual Change-Id: I16e6026acbaac230fe1453bbac040d1b75bcea2a (cherry picked from commit d1ced302)