Snap for 6198741 from 2047bf1a7a56f7a7f912e7d6983d372c10af43eb to sdk-release

Change-Id: I2f0e12dce1b39baaf3b5522656a64e4393bc6109