DO NOT MERGE: Fixes NPE when preparing app data during init
am: 46e6a0b1ff

Change-Id: I10b2ea0e557a7720099252c5a5c08679fb82b560