Merge "Fix TimePicker separator l10n issue."