Merge "Avoid hidden DataFormat.is24Hour field access"
am: 4d9823f3eb

Change-Id: If06ff869b5363867287cb37c86b1bf558bfa55db