Snap for 12231105 from a4c095561c891709ce999f044b9ed2777b509243 to sdk-release

Change-Id: I796e510380322ddcf1161e306173263523c5b1cd