am d61737b5: (-s ours) am 96f05f90: (-s ours) fix datetime setup problem. DO NOT MERGE

* commit 'd61737b560706ce928ebae16613eb2ee45a78b08':
  fix datetime setup problem. DO NOT MERGE