Merge "Rewrite the PowerAdvisor using standard power wrappers and clean up" into udc-dev