Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread