[automerger skipped] Merge "DO NOT MERGE: Fixes NPE when preparing app data during init" into qt-qpr1-dev am: 22f1bf64db
am: 905642177d -s ours
am skip reason: subject contains skip directive

Change-Id: Ibe66b1d51a5b0e66dff9ddbc53033866c218cd77