Snap for 6290619 from 90583604e8d5adb9fce3c88ea50d8de82dded18a to sdk-release

Change-Id: I712059ed856b7ec2d78baff8428939f2da49eb34