am 89fb1a6c: am b97ab2e8: Merge "Work around a Time design flaw." into jb-mr2-dev

* commit '89fb1a6c708e996329b4bcd2d0308cdd2fc268ae':
  Work around a Time design flaw.