Merge "llkd: llkSplit should prevent empty entries" am: 890c5382d1
am: 7e751e090e

Change-Id: Ibdad13b29b00c67724080928c9eb5ecc24e4f04a