Snap for 8005954 from 0b0cd5de9e179e5d0c7211b6bb04476abeb928f6 to sdk-release

Change-Id: I164110e0c758509557a49923e9bd6298ed1f65f3