Merge TP1A.211206.001

Change-Id: Id0b17e35a98b32219b9b662ccf09b77ac348d8e9