Merge "Fix newline in the message per CR Change method visibility to private"