Merge "Remove strings for wifi aggressive handover"