Merge "Update system APIs based on feedback." into udc-dev