am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2

* commit 'ecda5461603b6de77beb045dfdf82dad7ae48d61':
  Fix lease duration handling