Snap for 7133097 from 186e8fd9f16236f99595d7369405b12abc3da941 to sc-d1-release

Change-Id: I9d0adb9faa39ed0ae9768bfacdf0d14059f16f79