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

Change-Id: I56f36f62c7a278fb118c175da571e72f3605dfdb