Snap for 7579381 from 52d1cf97bd653aa150e6d94ae9df0ed7dfc7c955 to sc-d1-release

Change-Id: I172a532c467e50c3ff8958f850c7ca04f73de904