Merge UP1A.231005.007

Bug: 291102124
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I2082f1cf1b4b9e607ff710b223552f66babbb122