Merge "Fixed NPE during monkey testing."