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

Change-Id: I333be062bbad56136ca631d30f78f936d62cb3f4