Snap for 8005954 from 0f803e21ea82f291a2c91ca326bf43afe3d4544d to sdk-release

Change-Id: Ia575465f26de0cb21e29947f6d00f63e3e58bd8f