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

Change-Id: I57edbba53ef62fd614e9068e9267c2ac2aba5b05