Merge TP1A.211006.001

Change-Id: Idc673f99ac59d37e4aacc32a06f546f8e58750e8