Snap for 14820049 from 26c13f6d72e301f27e79ec0fbe30dd04782733e6 to 26Q2-release

Change-Id: I94c42fd909c034fce7b35fa037861182fb1df367