Merge "Fix checkbox touch target to be at least 48dp" into nyc-dev

                android:id="@+id/do_not_ask_checkbox"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dip"

                android:layout_marginBottom="-4dp"

                android:layout_marginTop="8dp"

                android:layout_marginBottom="-12dp"

                android:minHeight="48dp"

                android:text="@string/never_ask_again"

                android:textColor="?android:attr/textColorPrimary"

                style="?android:attr/textAppearanceSmall"