Merge changes from topic "liblp_virtualab_prepare" am: f093f2173b am: 48c1294538
am: 333eb0d413

Change-Id: I541b5fe37847fb94f5ff112b3154b4930a2630b4