am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev

* commit '3bf38b4165877274067a385cfe6472639a203a58':
  Add methods for Time_Delegate