Merge TP1A.221005.003

Merged-In: Ie06671a4a8bc857481c6c78362ce9fcaa7f3ba7e
Change-Id: Ic3683645e4290256d99e80e3e474014f380e5bf4