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

Change-Id: I88fb2ddd148018842da0fb6fca7b0d80b85187a0