Merge "Use ::class in place of string constants"