Snap for 6198741 from 3e4e6f7d41f7ca387810fc88370d9bcd8c937fb9 to sdk-release

Change-Id: I0adf9d49941bc75cbb27d6f387e6c0fdc72d9ef7