Snap for 7550575 from 8920d328806d4a3abcceb38030fc3499fde76328 to sc-release

Change-Id: I8b3667321299fb86fee8f808b01ae97a93ca4632