Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38 am: 98f03f4980 am: ef34053f26
am: 9103632f9d

Change-Id: I3b2b8355d80dca87a09ef97027753bcd568cff14