Snap for 5303890 from d94196def9dd6c98aed8bae277fa4d2501b50fd6 to sdk-release

Change-Id: Ie924dc1b92cb9bd932a7b7ce7e1d494f6e916021