Merge changes from topic "oct16"

* changes:
  Corrupt files should still scan into collections.
  MediaColumns._ID is auto-generated during insert.