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

Change-Id: Id6f523760baebc4c0b9cf082e4b161f7fce89f36