Merge "Tweak DateFormat.is24HourFormat javadoc to be more explicit." am: 093c509c40
am: 031b91574d

Change-Id: I50385cb665a557baad8b271bcfd4431072db7592