Merge "Retain auto-upgraded flag when updating a config." into udc-dev