Merge "Improve input device calibration format." into gingerbread