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

Change-Id: I8e69b8c677991aba376469a52730d61af77164a3