Merge "Fix NPE when runnin testActivity" into nyc-dev