Merge "Javadoc fixes to Time" am: b3c2efc615
am: b51c638a6c

Change-Id: Ifea3eb9d25754155681b1f74096eacac1fa0b259