Merge "Rename Alpha type constant" into udc-dev