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