Merge "Add missing Override annotation" into udc-dev