Merge "fs_mgr: vts_core_liblp_test requires root" am: 356951f2be
am: bd3586f7df

Change-Id: I97cb330c41fea14f17450e579f0465a339040bef