Merge "fix result code for user controlled disabled package" into udc-dev