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

Change-Id: Ibcac8ee1c680401a9311da0429cc482fb46a7344