Merge "Fix ClassCastException during monkey test"