Snap for 14786848 from 264aa423761b5c671c2c2f152b2d8b80ef2d6b7e to 26Q2-release

Change-Id: Ia97238bf20e164acbc0e1c0ce83b11c75ff766ec