Merge "Prevent sending CLIR activation and deactivation code only" am: 5cd5e277dc
am: 29ef902835

Change-Id: I9962a7b127cd32a3541eafc5447a2dd6a8511717