[automerger skipped] DO NOT MERGE: Fixes NPE when preparing app data during init am: 1e5261ce6f am: 407d5b4f39 -s ours
am skip reason: subject contains skip directive Change-Id: I46ffe00db2865d25b5e92c3028f1d2de073653e2
This commit is contained in: