Snap for 14882176 from 1a5a17196707240d45f9a353988915376b496c9a to 26Q2-release Change-Id: Iddb08e98865efde484c8ab7756d227f9f68316ac