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

Change-Id: Id9c87bc5e374556bedbda894e971247e2ead2d43