Snap for 6290619 from f061a94fecd30f063b7e02f47044e10c0bfbb13e to sdk-release

Change-Id: I69342e7ed762571d136e6a15b64f8f46c71f7e44