Merge "fs_mgr: Adding logs when failing to wait for a device file"