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

Change-Id: I8e00cf66808461ce5f03c0946bf4217cee82372a