Merge "Fix dump override." into udc-dev-plus-aosp