Merge TP1A.220609.001

Change-Id: Idcae17ce2fc128466d35a7fcbf3a4c7f0babc28d