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

* commit '5af3405f0d24c853bd10eb239c081e31972d3e1d':
  Fix lease duration handling