Use PHPDoc notation for @todo

Change-Id: I9c68098101a1d4d33f1ac9cf6f720e17b3419e92
Merge "Use PHPDoc notation for @todo"