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

Change-Id: Ic9c453168d6ab03e8d40bf9202b6e1b89fefaeff