am b4da1161: am aafc7b54: Merge change 27169 into eclair

Merge commit 'b4da1161f4a4170315a2e8332d95ceea2eb7bef0'

* commit 'b4da1161f4a4170315a2e8332d95ceea2eb7bef0':
  Improved object lifecycle tracking and fix leaks.