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

Change-Id: I55d0d124dcbd87e6ac0914933a0405111c88682f