am aafc7b54: Merge change 27169 into eclair

Merge commit 'aafc7b547c556da095777a7ed8aac71a68fa9b0a' into eclair-plus-aosp

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