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

Change-Id: Ia8efe3ae1cf67f5af9bae15cf0697d884d7f8122