Merge "Fix lease duration handling" into honeycomb-mr2