Merge "Enable https in nonrtric A1 controller"