Merge TP1A.211013.002

Change-Id: If9aee20ebf59041d7e0eceabdea0e6e706e590ff