Snap for 8952093 from f5716ffaefcb9486f7e22ff0deb3e5d6301a3fe9 to sdk-release

Change-Id: I07ddbcdfc26a0ffd4bbc15e00ef030c79022c612