am cd0e0048: Merge "Ensure #offer always actually offers something." into jb-mr1-dev

* commit 'cd0e0048881eb854a4d1524c2d54d6b9bb00f614':
  Ensure #offer always actually offers something.