Merge "Propagate the right permission information on empty prepare response" into udc-dev