Merge "Snap for 8124570 from 17ddf8de5cafcea592956293e2e061a7fc0515de to sc-qpr3-release" into sc-qpr3-release