Merge "FormatJson: minor cleanup"