Merge "Changing GridMigrationTask to use ModelDbController directly instead of using content uris" into udc-dev