Merge "Rename Sdr/Hdr to Hdr/Sdr internally to get avoid of confusion." into udc-dev