Snap for 8005954 from 4a8189676ba2408005579533b02b6b2fe7593337 to sdk-release

Change-Id: I0d1a46af6952e104b4ab92516ac800f5c7103f4c