Snap for 14756143 from f06dd1708271fad9b6a21dfc377835507b12b58a to 26Q2-release Change-Id: Ic2be9ff745a6561063ce3bd290a73134dbaadccf