Merge TP1A.211006.001

Change-Id: Id881cf99839142cf39ee7615f13ece3a326f0a66