Snap for 7506386 from 6f7d23a5039e20e13180a6dc0f1bcfb8fd76b8b7 to sc-release

Change-Id: I0e08d229deffe9d3ee602035ce3723312c3fe211