Merge "Disable our fancy logic to respect both sink and source's native formats" into jb-mr2-dev