Snap for 7579381 from 62a596661b1e479aef06b8ff5494c2edbd0c956e to sc-release

Change-Id: I318993567efffa5647f7ff5e9ea2a5b1f0c0d83b