Merge "Fix NPE when runnin testActivity" into nyc-dev am: 2155ad8
am: d1acd13

* commit 'd1acd13cb00d21d3d84005952f07d2c6629c144b':
  Fix NPE when runnin testActivity

Change-Id: I6265499e78d4ad3a1b7374fdfb68cf19179f7194