Merge "Assortment of fixes for APIs used by unicorn" into udc-dev