Merge TP1A.211006.001

Change-Id: Ie474d9fa94d2babe189001ca635c4b825c3d21ec