Bug: 79886305 Test: run locally Change-Id: I4a17cc7230cebdf7db1d78ed5a0ef37db1ecabb1 (cherry picked from commit 437a03f5)