Snap for 7095583 from d138942746826ec42294fbbccb5700b515ca86e9 to sc-release

Change-Id: I83da133c0b018f8edec3b48164c7c83712d207bc