Merge UP1A.231005.007 Bug: 291102124 Merged-In: Id2fb801e177b85dbc26355fea4ccaa64e2bd546d Change-Id: I8ccce1202abce7001c8acb8e95ae8a1791b9a194