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

Change-Id: Ie0bc2b81e09ee874ef848905bb486967a857c6d1
tree: 63a35a4813e3102541ee9330c7529006d76ff17a
  1. core/
  2. services/
  3. tests/