Merge "liblp: fix error message" am: 0d700897c4
am: 68469fb2e7

Change-Id: Iab4edf3632f7358cf7241c13acaa6fe4160a625d