Merge TP1A.211006.001

Change-Id: Id82aef733af21faf01bd1c42e17756c486bc9c10