Snap for 11211409 from 7fd07ea45fe86513943ae55e028a4d2f223238a8 to sdk-release

Change-Id: Ic989b6f1fee3b7aa30965d091afdee049d4990a6