Merge TP1A.220107.002

Change-Id: Ied808b4f85732f56649a1c4765e83bd360ecfcc6