Snap for 8005954 from 777d7ee8d23f0bea7c09efd128c022b0583fa8df to sdk-release

Change-Id: Ia30fa493b9da0358c59897c79d7ee46009b0ca7d