Snap for 8782634 from 6dcc83f9bfde627253bdc24495481ff910f186e0 to sdk-release

Change-Id: I4e06b95046e75cb7493bd3b49ebe7223bfa6e658