Merge "Enable unicorn APIs" into udc-dev