Snap for 7800789 from 7448ba54fae05a1ac4dedae512a8c3eb8c2b862a to sdk-release

Change-Id: I6defb59939d960d39dee0282553564f3d14dc06f