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

Change-Id: Iebbc8c92dba04d16440a326780197a8782d36e2c