Merge "fs_mgr: use std::string in more places"
am: 1fcf7f7d1f

Change-Id: I3cf220101eb8209a987af4bcd572d48d24c8a48c