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

Change-Id: I55b30099e4464c272c35bcabbddbb0b1364a5d65
Merge "Changed some comments from /// to /** @var */"