Merge "Catch SQLiteBlobTooBigException" into tm-mainline-prod