Merge "liblp: Modify NewForUpdate to accomodate two super partitions." am: 6900fce913
am: 9923bf70ab

Change-Id: Ic0763fa223fa4ff4e294ae7e1730e7a211c95b55