SDKJAVA-3 Update to match latest SDK