Merge "Disable sampler optimization until bugs are fixed." into jb-mr2-dev