Merge "Revert "Enable unicorn APIs"" into udc-dev