Merge TP1A.220624.020

Change-Id: Icc9ab26c9bf64cd23f78d6118b9ec04ee7d36755