am bb0fa96a: am 6c334eb4: Merge "Fix testSetToNow0 test"

* commit 'bb0fa96a7d6c455f134487e1e9cee51019fa3216':
  Fix testSetToNow0 test