Merge "Add aware metrics" into udc-dev