Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev