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

Change-Id: I8db97450adb46cfca6bf1866c3fef79cb5fb8f73