Merge "Add plumbing for setRequireConfirmation to CC"