Snap for 5303890 from 4a1d4f9eef5ab53310dea56abb68dcc824683790 to sdk-release

Change-Id: I4f08fbcbfde84b3158d715bfed1ec851e5a84bf0