Merge "liblp: UpdateMetadataForInPlaceSnapshot" am: 70a368119d
am: 81e069c454

Change-Id: I88540cee46f1c4195c774b838b3c57605fc5505f