Snap for 7594603 from 1c2e272efcf8c9db34fa832ff1a955250d0e41e3 to sc-mainline-release

Change-Id: Ie3f75c6a543c654d8f9baad0d4d6a56b2ddda74f