Snap for 8005954 from ad0dc47c99c086a158ae5cd414e62acd16b4f9d3 to sdk-release

Change-Id: Ic616fadac1381a05fb9d51bef6d7928f55d8c2fc