Snap for 6198741 from 4232fc6eedd7282b9449cab06b0207925c67bb8a to sdk-release

Change-Id: I4ac8971d8ab2a5862bec2c985695dac3d9ce4f46