am e8898d4a: (-s ours) am 885c3c11: am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2

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