Merge "Fix javadoc to clearly express units and base for time value." into oc-dev