Merge "Snap for 7236715 from e744802b8b4cd6d793facb905ef0f12c58b1cafb to sdk-release" into sdk-release