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

Change-Id: I0fcf9ec842fedc0078544f85b102a4ca80d5bd04