Snap for 7757670 from e0e160c54bfe3fb040108d7d3de50549a649deb8 to sdk-release

Change-Id: I38eb8f57882fb87a0da79480b6a4af00505828f9