Merge "Add GD advertising init flags"