Merge "liblp: MetadataBuilder::NewForUpdate takes always_keep_source_slot arg" am: b4383e144e
am: d38f61322d

Change-Id: I8a6b8a1caf666af5b947e723e53addee1f445d1d