Snap for 7800789 from 6d5cb01a7775990778ccc90cbc39f59344e22871 to sdk-release

Change-Id: I7dfbd246d14bc368e205e6757352970b0ddf8d50