Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously." am: ee5eb39169 am: 5973b8cf00 am: 4d0dadb629
am: b8150885e3

Change-Id: I9d5b0b46d11ba4b75073812b9ff71b061a694d34