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

Change-Id: I8b9ceb0ab13287bad92414e1bc52bc6f7308f73d