Merge "liblp: Expand the metadata header for future use."
am: 18bb214b3f

Change-Id: Ica89f0a30ce180e168f98937472daaee6c4933f8