Merge TP1A.211214.001

Change-Id: Ic59eefc4ca81e1152a0b2b5754ba2ccc4cc77ca9