Merge "Add nullability annotations for some apis and update java doc"