am 20e0b5c1: am 62bab313: Fixing handling of single-item data kinds.

* commit '20e0b5c18f08d0b2bb8187d614c97a8f6ba3ed84':
  Fixing handling of single-item data kinds.