Merge TP1A.211214.001

Change-Id: I0940d70749f98497a4c8179a9b2e3a8a2f789853