Merge TP1A.211006.001

Change-Id: Ic30a7739483544e79961f07baa1e5e488b0a97b1