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

* commit '3e7e176b0625702745542679f96cdf2bcd42e242':
  Fix refcounting bug