Merge "hal: update timestamp type"