Merge "[Aware] Remove the accept field from callback" into udc-dev