Snap for 8782634 from 0b6d79dba77cdf99a3a31cf566da27693e38e1b8 to sdk-release

Change-Id: I90033598c8bcc2864d98a2fa3affb038be77fb24