BPF Returns to NDA, Charan Boro Joins Assam Cabinet