Snap for 8782634 from 450b610902e5a919e474fdcc9b34fadcf89871bd to sdk-release

Change-Id: I9abcf702127f32213b06a3b2052550f721428c31