Merge "liblp: refactor MetadataBuilder::NewForUpdate" am: d97c946d37
am: 629fc64dec

Change-Id: I55c93cf378678b46bac8623b2c376f61210dbece