Merge TP1A.211214.001

Change-Id: I551b875779400343e69f5b8b39e185fcb16defd8