Snap for 7562097 from 4d5cc4db4296d48d31bd835c78647d6a060cdd5b to sdk-release

Change-Id: I9b5b28f01ccd23b581cd25f8fa47731c4ac7cb40