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

Change-Id: I8c5384fdcc471b7a29cff818813ee0a3738a9e51