SDKJAVA-5 #comment update for new API and SDK style