Snap for 7183507 from 6d10f91a77002b6371ebada491f507ef974ca572 to sdk-release

Change-Id: I8f0e51310f2733fdc4e91dd28c99a562633d343a