Merge "Cleaned up the deprecated APIs" into udc-dev