Snap for 5611628 from 3dd44d197317394e1aef6ea6794fa6a6a73c4d41 to sdk-release

Change-Id: I4fb46c5461af56d23b14b52f3b6d2bd49753494a