am 96e18052: am 2b3396f9: Merge "Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)" into jb-mr1-dev

* commit '96e180528b1084b5c3c6bbc284f8c218f071c37d':
  Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)