Merge tag 'upstream-v3.10.3'

Python 3.10.3

Change-Id: I747109d18ad96cd02bab6f872a4aedf271dc8e72