Snap for 14820049 from 7e73641d7723dc078bb963bea500621c8fa3f348 to 26Q2-release Change-Id: I77e3185bc2590d0388f1c89a8eb0d9972bc7e5d9