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

Change-Id: I43fc3a5dc505ca781ee9fe40faee803891d4dd53