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

Change-Id: I7ed4a6bb90f3cf3ed5fd0e6ad20b033e588a4c90