Merge "Fix the CC monkey crashes." am: 3d9f2834ba
am: a548bc35cd

Change-Id: I3c7f1e617f09a376d218db959e916061d8ae515c