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

Change-Id: I1df8c1e4d75e285cf424b0db1731aa3b1b2337f0