Snap for 7311204 from 89f2147a4c22c22b33333044e7dc8ecfe5f3ff6b to sc-release

Change-Id: Ie35b61ffa82e954ec712c91b604e528f0fd1196e