[TIDOC-1732] Update for BlackBerry changes