Merge changes from topic "liblp_virtualab_prepare"
am: 68aae7d748

Change-Id: I0af79e752e346460e8af8fd20f5a65b34750f6b9