Merge TP1A.211006.001

Change-Id: Ie14f7e587cfa14de4620b3e624455fe9b166e8ee