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

Change-Id: I6ef9050b822c63ab79fd93bfb86ef96837727904