Snap for 8005954 from 3f61f20aa30bab713cd65a3bc5d0c2e03428d4e7 to sdk-release

Change-Id: I698261d6c48a500a801d70f234c071c8ebf431a9