Merge "Attempt to fix duplicate available device problem."