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

Change-Id: I6f0c6c583e844b2db33fcfa239fcef4d80700fd4