am a08c5520: (-s ours) am 38053dad: am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""

* commit 'a08c55208335a2dfd6642793d6b3cc2e86615282':
  Revert "DO NOT MERGE Revert "Fix lease duration handling""