Snap for 7800789 from cadb13fc4a7e7e74149caaabad6da0a01a3b79d8 to sdk-release

Change-Id: I481f47807ab7bb76858800f8f40943547094e1ae