Snap for 8253222 from e6b9142b84f3a359235f6f4993dea8907241ad9f to sdk-release

Change-Id: I090a06e11835bbe4f8a213bf3e24bc6a8b79ae6b