Snap for 4953200 from e7cbff5118aefe44a397bc793e944b0f1eb7c84c to sdk-release

Change-Id: I83a5ab747a07c9dd2ab1115f3a9614ef7c64dd87