Snap for 7402811 from 854e221311214d58a72777b23565a1e0f843ff68 to sc-release

Change-Id: Ib8e25d13d169c59817671b0b1a164ca626c346f7