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

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