Snap for 7588529 from 3c0824aec6a5d3dcf3da5759c92e10db59a6b74a to sc-v2-release

Change-Id: Id487be228fb32ab9848e9bd234c86dec9481dcd8