Snap for 7518237 from 40d02ae9da2edb607d7294c49177a982400dba32 to sc-v2-release

Change-Id: Ie25b7e323903652534374af6d1811d208d1d14a1