Merge "fs_mgr: fix SIGSEGV when ostream << nullptr" into oc-dev am: 6ab008d183  -s ours
am: 122acf177a  -s ours

Change-Id: I6096bf830e172185063ab94d954ec0672fd9109e