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

Change-Id: I377c87ff04c537a3aed1c414fd6ff76e492c5d39