Snap for 6290619 from f21549ef464c73d389e70fffd49568be4045d1aa to sdk-release

Change-Id: I1a6bdbfff35045dec090bdf0d593716e8cd72ab2