Merge TP1A.211206.001

Change-Id: I0c135107eff53c3a3dc31a3004e13fe981c8375c