Merge "Update formatting and comments in FormatJson"