Merge TP1A.211214.001

Change-Id: I27c042e8f98210b81866a31714c09ffac2af2282