Merge TP1A.211006.001

Change-Id: Ia6111730af057a4eb7d4ef5bf40ac1d4193f9894