Snap for 6198741 from c71b27c2d5915151be26baef3870af0f61a89719 to sdk-release

Change-Id: Ieb10ad6a5a0928ce40e52d3a44bd3cb1ea18eaee