am bede7587: am fe49af26: Merge "Temporarily disable multiuser for specific builds" into jb-mr1-dev

* commit 'bede7587df180cc0a7335bac03e789249601db9a':
  Temporarily disable multiuser for specific builds