am d8896227: Merge "Delete sampler optimization." into jb-mr2-dev

* commit 'd889622733681cd8e538dfb433ffdef67cb02d54':
  Delete sampler optimization.