Merge "Remove unused private var and fix phpdoc"