Merge "Fixed a few minor nits in liblp" am: 7909d650bd am: 19bb15407a
am: 48daeba896

Change-Id: Iad9608e2095579eace9e88b30612f24924b9ae3d