Merge "llkd: enhance list properties" am: 70718dba91
am: 688a052ad8

Change-Id: I24d8a5391de2b929cb21adb3e7e7add7a5eb3175