Snap for 6877830 from 74de0bc61dcfbd6785b05c53a223a10141ead111 to sdk-release

Change-Id: I0b81cc8a918232119bf732f8516bbb01ee2ad606