Merge "Add GD hci & controller init flags"