Merge "Changes for D2D transfer bugs." into udc-mainline-prod