Merge "Add flag indicating transport is device-to-device transfer"