Merge TP1A.211214.001

Change-Id: I17f7ccc7f22d33d2a64530e9aad83b4cc9525cbd