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

Change-Id: Ia045fe2f4d99e42e97895b8045531b66de64a9e5