Merge "Fix PHPDoc type for instance variables and methods"