Merge "Fix bug for CLCC polling; remove message if not using"