am 38053dad: am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""

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