Snap for 5798008 from a64f8d95218076d5872ca3404da4e807c09ed160 to sdk-release

Change-Id: Ice330c41fa900468ce7c169be5567a2d53041c93