[automerger skipped] DO NOT MERGE: Fixes NPE when preparing app data during init am: 46e6a0b1ff
am: dcd0a2e341 -s ours
am skip reason: subject contains skip directive

Change-Id: I02542d777ee3b810b42f6debb8e158e28b8fad46