am 170efccb: am b344a4ac: Merge "Fixing TimeTest"

* commit '170efccbf56c3c292e9a931249ac64e1c4ca1a18':
  Fixing TimeTest