Snap for 7800789 from 0bd1dfab8804d32af19ac675fa9a7b8e8d2b5687 to sdk-release

Change-Id: I8677e9dc331cb95bd93b0febb254e1da2ea242ea