Bug: 78184573 Test: tests/test.py Merged-In: I9cf5df612322eb66e9a46450d7f43c99586dbab6 Change-Id: I9cf5df612322eb66e9a46450d7f43c99586dbab6 (cherry picked from commit 9c569ce7)