Merge "Fixed sonar issues in ProtocolSupport.java"