Merge TP1A.220107.002

Change-Id: I363e452106d3c13209cba6dce4cfde738f53eceb