Snap for 8074123 from 3f44264430c20a2c3d493be861ebd50b4f3eef7a to sdk-release

Change-Id: If8f8db16c876b9db13e9b3b0ef1c53e7e12d39da