Merge "ValetStatus.jsvs: Fixed sonar issue"