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

Change-Id: Ibf5b2fb27842fb2333fb8271f5cd6fe69c6963d1