Merge changes from topic 'refcount' into oc-dev
am: f4c0dcae69

Change-Id: Ib1ed7331dd83c9110d7b36de00f1a64dd98d0ed4