Merge "Revert^2 "Prepare to fail in RefBase destructor if count is untouched""
am: 2d3f234f20

Change-Id: I12acef5c4485616cbb0fd57162bcca0919068132