Snap for 11085410 from 064fa13ea3898f8cc10d5a8eeddefa34cbad8210 to 24D1-release

Change-Id: I84fe6ce7a605011deaf6c84ae32ca9dbc933a46c