report a nicer error when importing malformed CSV

Bug: 972411
Change-Id: I42f7bac65d45a6fbe9cf53bc591ac8a5151c07f1
Merge "report a nicer error when importing malformed CSV" into release-0.13