am 98c4d6eb: am 1c269da0: Merge "Fix NPE when kind is null in getBestType" into klp-dev

* commit '98c4d6eb8a73d0c907586c297e35aa2502637a2a':
  Fix NPE when kind is null in getBestType