Merge changes from topic "liblp_virtualab_prepare"
am: f093f2173b

Change-Id: I26a7222a01679fde82c9987747ebf2a1fba278da