Merge "Merge "liblp: Remove the slot-suffix requirement in MetadataBuilder." am: bc53c842e9 am: 32fd128402 am: e7f69de114" into qt-r1-dev-plus-aosp