Snap for 6290619 from e892a62257eb19888144f842fd03eb70ccabe8bb to sdk-release

Change-Id: I701892278be033715537c24da0294a2637538580