Merge "Update docblocks for methods potentially returning null"