Merge TP1A.220624.003

Change-Id: I2eafcf6f421101e8997b047408d21b069615b54c