Snap for 11812660 from e7f56774f4a1fad4881c797776bacd9f6b193b7c to sdk-release

Change-Id: Ibee4dfdd5269c00866f1cd460aa07a0a773fc38e