Snap for 8554636 from 71cea06298c0668aa081be9b3b843393809bba37 to sdk-release

Change-Id: I365230e796c1cddc4aa8d9df49ef0f13937a6ea9