am a03dab4e: am c23fc049: am 5339119b: am 62dacd67: Merge "Uncommenting throw when item not contained in sBgItemsIdMap" into jb-ub-now-jolly-elf

* commit 'a03dab4e6f3be198fe118de5e99038a7deec3611':
  Uncommenting throw when item not contained in sBgItemsIdMap