Snap for 8782634 from ee7766102f6b9a53cfec8def24956c63922290d2 to sdk-release

Change-Id: I786193f15bf51f9b1ba07ecb4fdcfb4437755fa4