Snap for 7550575 from 185c7d4a837497be3b5ff78ca2c16d040b058a7a to sc-release

Change-Id: I9e6ad74976ae29aaf10b61020e81af94d83f626c