Merge TP1A.220107.002

Change-Id: Id21b81bba95d803703a50168072fabc1957b8532