Merge TP1A.211214.001

Change-Id: I29501f4f58c14a872773117c69b9d87ed60af74f