Merge "Set controllerType to uppercase for LCM"