Merge "liblp: Remove the slot-suffix requirement in MetadataBuilder." am: bc53c842e9
am: 32fd128402

Change-Id: Ic6fdadc40ca1527808e703893cac97938df6a9a3