Snap for 7800789 from 00be4cc817a6d2e79e0d7f95a6ac9cd95774c9b6 to sdk-release

Change-Id: Iedfc08d5547a8e6c7cfcb94f82686b005df81ed9