Merge TP1A.211206.001

Change-Id: Icb9a1bed534db69cf24f62907b4f247aacb5a95c