Snap for 7604940 from 3d4236ff600114c4fde317c86b979ae1482a86ef to sc-d1-release

Change-Id: I2fbf41c3c77783ba3f7134267875e9c4f57aceb2