Snap for 7592383 from 63fd8aebbdf0cc38994a94625b6de5b7111f20dd to sc-release

Change-Id: I18a1b9cd017a5580e9c591c07af204f3e5656183