Snap for 8952093 from f5fb8846f16b189509ee0d09eb886c3ff4bbdab3 to sdk-release

Change-Id: If9ad85d71f2f72d71c912cf430baa0b8faad5382