Merge TP1A.211006.001

Change-Id: I04704638637a9dfa6b7571b191a4cb9d2429a741