Merge "Adjust device info constants for consistency." into gingerbread