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

Change-Id: I26a0dd8a3f7693f008b5fb35d78dc41ceb333031