Merge "Remove unnecessary class name"