Hygiene: PhpDoc, unused variables, etc

Change-Id: Idde8c07ebbb5563ba1245f3f77b3cb3f4ba97659
Merge "Hygiene: PhpDoc, unused variables, etc"