Snap for 8005954 from 17dc83a3e0573988ee55348f9dedb9990cf6bbf4 to sdk-release

Change-Id: Iaa1b067d7fa852e0f465200c106de0c649d1ddd5