Merge "fs_mgr: string literal cleanup" am: 0a6c743179
am: 455a0162f5

Change-Id: Id095509d021da8946e7db804299a2ff0b465336a