Merge TP1A.221005.003

Merged-In: Ie8c226d9e7d1d0dc481d026ccd454a1db46fb915
Change-Id: I9bf5ef79251de438ff6db33bc694b28922733f50