am 06f4c8c7: (-s ours) am 884f3b14: am 925b911f: am 013af337: am 4eeaa61f: (-s ours) am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev

* commit '06f4c8c7315956a906d054d52ff7f27bf84db8b9':
  Add methods for Time_Delegate [DO NOT MERGE]