Merge "Fix spin waiting for weak ref access in the intern table for CC."
am: 4f27f0baff

Change-Id: I64dc9388e0a0e5d39ebe15885470f298cb99426f