Merge TP1A.211006.001

Change-Id: Ic98e55e5638ba8b642eecdc335ca5fa1067b481e