Merge "fs_mgr: Drop some unneeded dependencies." am: d262346b57
am: 44df32dd56

Change-Id: I51fe869b611442ed7f83f72dfca4f52c3883e9cf