Merge "Update formatting of includes/normal/"