Merge changes from topic "liblp_virtualab_prepare" am: 68aae7d748 am: 8644f52338
am: 0ddfaaa7db

Change-Id: I34edefb22bd1235a1ed9f2d4f86ed42d99565b21