Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2