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

Change-Id: I3939ec2946bc1b4dcde4f9b0578dfeaef9bb87b2