Merge TP1A.211206.001

Change-Id: I78f87b770c340ef1a497a0ae0f5a843279aead35