Merge "Javadoc fixes to Time"
am: b3c2efc615

Change-Id: I9793670f518d15fc42caa01a519c33e451998a77