Merge "Make RefBase more robust and debuggable"
am: daac359be7

Change-Id: I9844b2260b607987c688869c643560d5b9c92d75