Merge TP1A.211013.002

Change-Id: I793156b47d2f8345daa3caf8e75d6acdb0e62882