Merge TP1A.211214.001

Change-Id: Ic996c7dfe0bf96cf58aac403d491ac5053e9d956