Merge TP1A.220107.002

Change-Id: I80d18d96c3555e2a1230dcdf7f6d6759783aef38