Merge "Update dirty-image-objects with udc-dev profile" into udc-dev