am 2797b47f: Merge "Disable our fancy logic to respect both sink and source\'s...
am 2797b47f: Merge "Disable our fancy logic to respect both sink and source\'s native formats" into jb-mr2-dev
* commit '2797b47f':
Disable our fancy logic to respect both sink and source's native formats