Merge "Work around to get ride of NPE in app startup test" into nyc-mr1-dev