Snap for 5475808 from e4548282e93bbd0e8a7d9d7b8eddebcd4b06c84f to sdk-release

Change-Id: Ic4128fb41233a6131d9339f01848459157679f32