Merge TP1A.211206.001

Change-Id: I99fb566a898f69e8b371032d91a08f012e986a3a