am 66d079bf: am f7eb3398: am 19949b9d: Merge "Guard against missing document columns." into klp-dev

* commit '66d079bf25ff3f99dbba91e02d392c936238170b':
  Guard against missing document columns.