Snap for 8005954 from 9706e6072f295cf03e8cc5b25f01043687f484d4 to sdk-release

Change-Id: I4de1a074acb36eb36c54c5c2ca820724220e7639