Merge "Revert "Partially revert the usage of string enum."" into udc-qpr-dev