Snap for 4953200 from cac27a14e822c8d31e4cef2886899dfdb0a3168a to sdk-release

Change-Id: I4529bccf776154f7425c9e18bfac975533e1b02f