Merge "OpenCollaborationController.Java:fixed sonar issue"