Merge TP1A.220609.001

Change-Id: Ia4e9992c60915b2ea93764042e276c1fde45253c