Snap for 7800789 from 1f884fbde58c0c38f9a576a82e74d6d0ee010d5a to sdk-release

Change-Id: I1dba1dd010ea6ebab57033cacf16a72ee40f7c12