Hygiene: Fix phpdoc errors

Change-Id: I389ac1c62e1ceabc51ef8517ba73e6da2e215515
Merge "Hygiene: Fix phpdoc errors"