Snap for 6290619 from 0dcd4e8262f521f08a8302051ad6c81489f05754 to sdk-release

Change-Id: Ica79b4f184bb16f5c5bf5c50477d0458b284a875