Merge "Update docs and add nullability annotations"