Merge "Improve udev failure diagnostics." am: 5ad9ba12df
am: 94202c2b9d

Change-Id: I23e5d2622f485f5248cd4d1426b8327b637be7a0