Merge "Snap for 6290619 from b177df2af4f8771622f3a8567ae5b7d884e26ec6 to sdk-release" into sdk-release