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

Change-Id: If93cba5037488240b2d48334f642eb6240c8ce7f