Merge change 8227 into donut

* changes:
  Handle null in MatrixCursor.get*()