Snap for 8005954 from 4d94ce0f2d30ae520f46a899d8fceb6a36be57e5 to sdk-release

Change-Id: I5a7b86f13269fb50f1fee5354273830d5c1518a1