Merge "Fix WifiDialogActivityTest broken"