Merge "Address comments and final cleanup from refcounting integration"
am: 222529d95c

Change-Id: Ie0bc2b81e09ee874ef848905bb486967a857c6d1