Snap for 7800789 from b5f01bfaa0f87d12708003f7fc4db8e21e407d77 to sdk-release

Change-Id: I13ddc58563ed318f233e9cbfc649fe73e16bd36b