Snap for 7800789 from 2e1e76b8ff772cfde0aec4addf29f77fd9cf6d8a to sdk-release

Change-Id: Ib92a4727a09dbbef5eb601a6031f37a33a53066e