Merge "Fix double-accounting bug in liblp." am: 42294631a7
am: aaf5d64713

Change-Id: I9e00135d9d20212c79c1d3dc246b31b82421eefe