Snap for 7224597 from 4ad2bf41adffdb2b559281bc1c4f6da9ec28d4e0 to sdk-release

Change-Id: I0485b70ede3c4b387782b25d90bf664ad872d042