Merge "Fix monkey test crash at NullPointerException"