Merge "Do not use unstable Android styable.CheckBoxPreference" am: 04f79369f4
am: f0eb9e8989

Change-Id: Ifce8ac3a1ea6343802849b8db251952c840b679e