Snap for 8005954 from f021041ae968624b8d625a73f8853c451767e116 to sdk-release

Change-Id: I810b7a5f1b4f77eccfe30e3bfeb2baed1eac3bd2