am bd247198: Merge "Fixing issue with resource ids. (Bug 6532243)" into jb-dev

* commit 'bd247198516be22cbf56b1a828c7dd43f9848591':
  Fixing issue with resource ids. (Bug 6532243)