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

Change-Id: Ic59f8a7bb47dc834b4c947dea88911a2c018ef12