am 3c226bf6: Merge "Fix old remaining i18n bugs on TimePicker:" into klp-dev

* commit '3c226bf6acea0b8dff34a2113009b6d918a3af65':
  Fix old remaining i18n bugs on TimePicker: