Snap for 6290619 from 9cbdb82e0d061084cc9c6cf8e80768711350a541 to sdk-release

Change-Id: I76156621dfb44b1f8b99270896eacd958f4316fe