Merge "DO NOT MERGE: Fixes NPE when preparing app data during init" into qt-qpr1-dev
am: 22f1bf64db

Change-Id: I9fdb42c2f5c77bf19de36ec56a5923bf5ded1012