Merge TP1A.220404.001

Change-Id: I2f497b0fd3476a6db49a63cf7b2141d859ab56ae