[automerger skipped] DO NOT MERGE: Fixes NPE when preparing app data during init am: 1e5261ce6f
am: 2ef1824050 -s ours
am skip reason: change_id I8ae4e331d09b4734c54cdc6887b273705dce88b1 with SHA1 46e6a0b1ff is in history

Change-Id: I913149e1c017d70a488c4f801749501f72fcc07e