Snap for 7843118 from 06ffad9629ef924695c7c598e69c6ef416687b3f to sdk-release

Change-Id: I1078230ea9634cc0c18772f338aa278cfda32e29