Snap for 5925869 from 091e3281dbcbdc89f790a0a6dc156e4d84374f76 to sdk-release

Change-Id: I7e93d3d1ae4d837950f34b9d973c6bae610fefc2