Snap for 6924456 from ce150ed249cb745a3599bcb80fb1147321b3e227 to sc-release

Change-Id: I19c97fd90e980746ad66510d41cb074b9d8c26f6