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

Change-Id: Ide5292389c2e91c8a7ce71e655ceec92a640cbf9