Snap for 7183507 from 3c080da60e51ebf0208d787f4aed0537e3a6b683 to sdk-release

Change-Id: I124d01e69dd4ea36389d50a16ca36cdcf09e049c