Merge TP1A.211006.001

Change-Id: I0efdd5ac771e20c5f5ea60af3232c66abb211ec9