Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d am: 98f03f49 am: ef34053f Change-Id: I3724485cc956b2d5a64a6e71f325181d5fdbcccf