am 6e7f4ff0: am 54950687: Merge "Fix refcounting bug"

* commit '6e7f4ff0ed4962e2a72541f797c6a778a7062df3':
  Fix refcounting bug