Work around to get ride of NPE in app startup test
am: eaf08cf7d0

Change-Id: I2ef8cb36261f47055362d4af489f37cc61ddef13