Snap for 7539243 from 6081806d8a5890c3afce81aa8379e72ff2891a5e to sc-v2-release

Change-Id: I5b9c8b0c08787ddcaaaa0a2b32310d89ad10750a