Merge "Check if we need to Poll for devices after RegenerateUevents" am: 06e6b8551a
am: 25ccd57180

Change-Id: Ie42f56d0d4af3a6b18f0afdd1b4667fcd5bfd97a