Merge "Changed some comments from /// to /** @var */"