Snap for 7717622 from 4fb97923e5bc781245594e7b422eb2e127c6648d to sc-v2-release

Change-Id: Ic504e969aa38aaba01cbd69efddf9057827fc356