Merge TP1A.220624.003

Change-Id: I950bb749beca8854169121672a9730a4f4de3ecf