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

Change-Id: Ib8bbbf9dc3570b53d0a41c3baac6caf3edc32989