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

Change-Id: Ia06a591cec41b2546d99411e51741bfdbe5c7886