Merge TP1A.211214.001

Change-Id: I5bb16a7ad7ef925516e2e263c2712637e1672fb9