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

Change-Id: I62545bdd0604ee0911249abd7628c99868093c77