Merge "Fix phpdoc of class vars in ResourceLoader"