Merge "Fix a CC crash with ThreadStress."
am: e793bbb4a8

Change-Id: I554f3c1cc37b44ae8537241e235f267733837759