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

Change-Id: I86f7cf743e1e9f2466eb7675ebc1de61ae9ab3ec