Merge TP1A.211013.002

Change-Id: I0b5e0d70cf5f99ea94f69c06f2bb3b60c9d2022a