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

Change-Id: Id9901460f0d60c0c3fffd083e70b05e0bfeff8ee