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

Change-Id: I5345550ba9c58a699c7b36de51874adab73d4aeb