am 885c3c11: am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2

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