Snap for 6198741 from a744f6b78ab37d01e5116fc4a77fe05a15b43429 to sdk-release

Change-Id: I86ba7fb084fcadd7e0b9f4eecb4f3f0da81a8a4f