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

Change-Id: I6b96dc77a88e9ad5ee638153dfe56214be164796