Snap for 7800789 from 91761804f6e3bfceaa2894681b6fe86d79fb3b4c to sdk-release

Change-Id: I0d3b92f17df867437d43d8fc451d73e6148f789e