Snap for 8005954 from b42a3b2f6f04095a17633222e9b4d468573d5bb6 to sdk-release

Change-Id: If16dcc54d6ca9c748c764c266efe1eeb183b438c