am 17917a95: am d3f9ffe2: Merge "Prevent transformed ops from merging in the...
am 17917a95: am d3f9ffe2: Merge "Prevent transformed ops from merging in the first place" into jb-mr2-dev
* commit '17917a95':
Prevent transformed ops from merging in the first place