Adding support for time units

Change-Id: I190cb9d3c190f61e75a46a0c3b5ff30d04c92d8e
Merge "Adding support for time units"