Merge "Fix bug 3380299 - Update checkboxes to show checks." into honeycomb