Merge "Fix bug for CLCC polling; remove message if not using"
am: 43cecf9570

Change-Id: If30f3c75e6a01c40ef9ff9d0e4ea247fd30cc143