Snap for 5611628 from 60c33d85d08dae0a1fc33829ad0479950912151a to sdk-release

Change-Id: I8d74434d071d48a328fb5f47cc8a44f9dad3feb5