Merge "Fix spin waiting for weak ref access in the intern table for CC." am: 4f27f0ba am: 50c6098f am: f430e396 Change-Id: I40189a1baedc294555ecb874f1f763bf12c3b98a