Merge change 9531

* changes:
  check return value from Cursor.moveToFirst()