Snap for 7149879 from 60882280850f9f9e5483c4e468e71a90b8e03079 to sc-release

Change-Id: I526a69acf97dcff338367c5b63c88a65d18c454e