Snap for 8554636 from f9ba267a39fe31bed324b249a51c33f6d86c3055 to sdk-release

Change-Id: I2ddb498f15a015397870016abf5e66542ded9951