Snap for 11098369 from e56553d39a0d0232ab6c9928a8de653c08145be6 to 24D1-release

Change-Id: I1311fbf3920376417b53f0ebd35b57bd7cc4404a