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

Change-Id: I12b77cb0febed5beb72f997f652cc93f62cdaa8a