Snap for 6877830 from 27aff84c5e4cf60a40982c3f7e9cc7606e3c9804 to sdk-release

Change-Id: If7b52b7f5d70ec1675400821beaa019a2f14cadb