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

Change-Id: I077024dab5ad30794b27da45db518b761ea07279