Merge "Add extra logging for changing CLIR settings." am: a72242c83f
am: 4aa6133d09

Change-Id: Id599fffc79c99d6bd05c5312bd85ffa686e9a6e3