Snap for 7521319 from 1f5a4c9522824810d3703cc7655c312be2407157 to sc-v2-release

Change-Id: If0845a1f1b31b23101233f294f3837876e3e7ed7