fix(feat): removed internal time unit conversion, now using the diamond one

Change-Id: Ibf52200bf05baa1dc5cce2f82284aeea85d5eb80