am f7630cbd: Merge "Handle IllegalStateException when cursor contents are...
am f7630cbd: Merge "Handle IllegalStateException when cursor contents are empty" into gb-ub-photos-carlsbad
* commit 'f7630cbd':
Handle IllegalStateException when cursor contents are empty