Merge "Fix incorrect imports for AlertDialog"