Merge "Enable large sd cards." into idea133