bug: 77853712 Test: test.py (cherry picked from commit 30025095) Change-Id: I2af5c784f2ca12cd5b0859d93500c16be6a03428