Snap for 8005954 from bdc91278a69b73756f7456bf06117f5c06f4d580 to sdk-release

Change-Id: Ifc045ed5d1ed7cf5f97e073ed363bc8dc3f0a0f1