Merge UP1A.230905.019

Merged-In: I2c179c495a46418452a03c3fe67c2dbdff16629e
Change-Id: I7b4dd67f055b8dd3aef430133120547c1277c3e6