Snap for 6290619 from ee58ce6a1931a4410059f2651d7e444bb8df35dc to sdk-release

Change-Id: I9e5c6f2af4d938852774f87adea2459b88ad9b54