Snap for 6198741 from 5c7f635e3ecb58cf1a19b3ad3f7ce6e6320188e3 to sdk-release

Change-Id: I19aede2d263698e6aa99cb6b19804d37b067ded8