Merge TP1A.211006.001

Change-Id: Idec766e01b5d1606259f085c3a508f283992355a