Snap for 15073144 from de3d52e19b727045a8de244fc481a7e326e3e42d to 26Q2-release Change-Id: Ie4cba63ca067fe25f2d4a5e852c0cb8e35202e77