Merge TP1A.220609.001

Change-Id: I2641b94a70046655c8085c81bce5c08aa56e4f62