Snap for 11962796 from e42404326e73f3c273a2273c2dd7c05075b6209f to sdk-release

Change-Id: I3e89420b93d4d288730913b84c32e0f825d55939