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

* commit '1195487228e1eb6c8859368286168051bd505b2f':
  Fix lease duration handling