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

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