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

Change-Id: I0612286b8d95b0ae10c1337214f9c3b4e570fbac