Hygiene: Fix PHPDoc warnings

Change-Id: Idf3715538800ea9b85377d0e5048a9290f7ef017
Merge "Hygiene: Fix PHPDoc warnings"