DO NOT MERGE: Fixes NPE when preparing app data during init
am: 1e5261ce6f

Change-Id: Ie96abe8d388a6b8f147ea2d75ddf32d64814bc35