Snap for 8074123 from fc4dcbd61b1f6f8ab5fd7da5c636f836805e18fd to sdk-release

Change-Id: I805310ee720dd019e269351ca121d271d678bbc6