Merge "Fix classCastException when Monkey test"