Merge "fs_mgr: fix SIGSEGV when ostream << nullptr" am: 225f0d98c8 am: 9af4b13b8f am: 942b4efa2e
am: 63d224a2bc

Change-Id: I2798cd3e57b89a5a8b48d72d62f00b749cc690d9