Merge TP1A.220609.001

Change-Id: I37aff21a071b02c154143f41cb6ba7f516193275