[TIDOC-1732] Update for BlackBerry changes
Merge pull request #5817 from bhatfield/tidoc-1732

[TIDOC-1732] Update for BlackBerry changes