Merge "Use double-digit hour on 24h alarm format"