Merge TP1A.211006.001

Change-Id: Iabe577df6d04a1e5a77404916183388adc0a1863