Merge "Update formatting on includes/deferred/"