am a2bf7343: am 70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo

Merge commit 'a2bf73435ba776de1a55847276fc54c00648971b' into kraken

* commit 'a2bf73435ba776de1a55847276fc54c00648971b':
  Fix OperationScheduler moratorium calculation for clock rollback case.