Merge TP1A.211022.002

Change-Id: I69ec62d24f805a82ea976690c321d0e6e19ccaf4