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

Change-Id: I055425b0dfdbccbfa9c72e9bb1390ea483afdb9c