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