Merge "Fixed as per Java Code Conventions"