Merge TP1A.220107.002

Change-Id: Ia12fa0a92695dbfcc951fedebd3df965d97d5190