Merge "Fix monkey bug NullPointerException."