Snap for 7183507 from 35326cce9698db9c5eb0a16e4b46da4fc21ea609 to sdk-release

Change-Id: If467d2a270061d43150166b50d28d7e1ff4ce4db