Bug: 71486762 Test: tests/test.py Merged-In: Id956804c36b0c06b4e6259d6864438974ed18267 Change-Id: Id956804c36b0c06b4e6259d6864438974ed18267 (cherry picked from commit bab864d2)