Merge "Refactor function to support slot size not must be two." into udc-dev