Snap for 11079393 from 937074db8cb1389bec5121a26c70a858c607e87c to 24D1-release

Change-Id: Idacf7ffde4d64832df2dafffa82eec629011c26d