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

Change-Id: I19ba38a596527a4544437d126c80123381b065b4