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

Change-Id: If10a824b6c521e9c8fd8a581720a6839f5f0fdf5