Hygiene: phpdoc comments, unused variables

Change-Id: I5568178e9eebdd72333f429a15979d69a5539756
Merge "Hygiene: phpdoc comments, unused variables"