Merge TP1A.211006.001

Change-Id: Icf682734dda509cf533f3914e1859642aba3299c