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

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